Merge changes Id91fabb4,I6d117032,I88fce1b2 into tm-dev am: fae0ef515c

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

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