[automerger skipped] Merge "Move the compose code to tm-qpr-dev (1/2)" into...

[automerger skipped] Merge "Move the compose code to tm-qpr-dev (1/2)" into tm-qpr-dev am: b8ea8075 am: 8532baab -s ours

am skip reason: Merged-In Ic3efb42d371c6aac8c2a6297a0cb192a780903cd with SHA-1 33470b90 is already in history

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



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