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