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