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