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

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

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