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