[automerger skipped] Merge "Make Pip usage of FrameCallbackScheduler an actual class" am: 5930b62e am: 93b095bc -s ours

am skip reason: Merged-In I1632bd87a0f02940317a38a87b074d303f80b8c7 with SHA-1 c6c60307 is already in history

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

Change-Id: I4c36e3fa3cd7e1b8c33a310ae9b6cdc18fa9390f