[automerger skipped] Merge "hwui: pass framenumber with FrameTimelineInfo"...

[automerger skipped] Merge "hwui: pass framenumber with FrameTimelineInfo" into tm-qpr-dev am: 0aafe55e am: d7bb46f1 -s ours

am skip reason: Merged-In I446c054db944ec54edd55452032a622d0a7a414e with SHA-1 2cf5053e is already in history

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



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