Merge "Inject Choreographer of the shell main thread" into tm-qpr-dev am: 7560f94e am: 80ddbcc9

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



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