Merge changes from topic "am-18ca3288f6af4f0db26806b0693afa74" into tm-qpr-dev-plus-aosp am: 9c39625582

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

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