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