[automerger skipped] Merge "Minimum 1 frame timeline in java Choreographer"...

[automerger skipped] Merge "Minimum 1 frame timeline in java Choreographer" into udc-qpr-dev am: ddb2fb71 am: ae8460cf -s ours

am skip reason: Merged-In I8b704433aca55bc9697fd843257ac62995e75a1f with SHA-1 8d65862b is already in history

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



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