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