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