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