Merge "Fix refresh rate callback fan-out for choreographer" am: afa11145ec

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

Change-Id: Ia46958d94f3267bfddfbf0ce0d30ef48ec74a32d