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