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