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

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

Change-Id: I7ff41e7d479d424238728752ae926c2baec09a14