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