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