Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18452103 Change-Id: I0266b4e2eea0e783db15024027efab1b16a7b13c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>