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