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