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