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