Merge changes from topic "cherrypicker-L06100000954878020:N56300001270177780" into tm-dev am: 29bae99600 am: 81407f77eb

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

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