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