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