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