[automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into...

[automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534 am: c8e6f29a -s ours am: 300375a3 -s ours am: 97cc6236 -s ours

am skip reason: Merged-In I7254da424bce3df7bf4c4a3e1a5076656b7b2f18 with SHA-1 235814bb is already in history

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



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