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