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