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