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