[automerger skipped] Merge changes from topic "conn_t_move_tmdev" into tm-dev...

[automerger skipped] Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e -s ours

am skip reason: Merged-In I4c8f84b5b7df057b30ce334a99ce4ce975080020 with SHA-1 91184376 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378069



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