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