[automerger skipped] Merge "Ignore AttachedChoreographerTest testChoreographerDivisorRefreshRate / testChoreographerAttachedAfterSetFrameRate" into main am: 64bec187cd -s ours am: 2a536b6dfa -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: Id34dbc1fd57e1b6ada96d13e4186ebc18f6f4896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>