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