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