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