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