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

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

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

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