[automerger skipped] Merge "Make Display.Mode.isSynthetic TestApi" into...

[automerger skipped] Merge "Make Display.Mode.isSynthetic TestApi" into aosp-24Q3-ts-dev am: 4848ffd8 -s ours am: 137ea514 -s ours

am skip reason: Merged-In Ic28956ac65f9642b9a78a31fff0111e28c6a69e0 with SHA-1 493a723d is already in history

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



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