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