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