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