Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490 Change-Id: I167314dacdf0102aae00d67d229fc4459d1bc56a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936490 Change-Id: I167314dacdf0102aae00d67d229fc4459d1bc56a