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