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