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