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