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