Merge changes from topic "cherrypicker-L34800000954905788:N57900001270872696" into tm-dev am: 52f0fe0c47 am: 3ac6da7e42

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

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