[automerger skipped] Merge "Ignore AttachedChoreographerTest testChoreographerDivisorRefreshRate / testChoreographerAttachedAfterSetFrameRate" into main am: 64bec187cd -s ours

am skip reason: Merged-In Ib423e03b9f96ce45f60585e5901fdbefb9d4505a with SHA-1 2776b0e511 is already in history

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

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