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