Merge changes from topic "am-add98e558e714afdb507c739986ad650" into tm-qpr-dev-plus-aosp am: 633c87b8cc

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

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