Merge changes from topics "cherrypicker-L37800000954756398:N06400001268122372", "cherrypicker-L61200000954646707:N00900001267167505", "cherrypicker-L64000000954631044:N08200001267145803" into tm-dev am: d84c99cad2

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

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