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