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