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