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