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