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