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