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

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

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