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