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