Merge changes from topic "cherrypicker-L15200000954882986:N47600001270136565" into tm-dev am: 3caf95c8fc

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

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