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