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