Merge changes from topic "am-cabd4650c28c44639baf0539bd42a1b6" into tm-qpr-dev-plus-aosp am: 7212b6e596

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19994145

Change-Id: Ie24ea3fca8af2a7f928f46f1bd8410c80edc3dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>