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