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