[automerger skipped] Merge changes from topic "conn_t_move_aosp" am:...

[automerger skipped] Merge changes from topic "conn_t_move_aosp" am: e69e8e90 -s ours am: fb39ec42 -s ours am: 5312a5ef -s ours

am skip reason: Merged-In I399d2bb259d50916c575e59621ddfaf798affc5c with SHA-1 0ef7fe46 is already in history

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



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