[automerger skipped] Merge "Fix refresh rate callback fan-out for...

[automerger skipped] Merge "Fix refresh rate callback fan-out for choreographer" am: afa11145 am: c02e7f48 am: d10b7235 -s ours am: 4c48bb8e -s ours

am skip reason: Change-Id I66abc2e28e60f06987ce3a54be294c94b77524fc with SHA-1 c080030e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1434718

Change-Id: Ibdcc43a56673526d4e9e04fa1bdf47a9795a256e