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