[automerger skipped] Make Display.Mode.isSynthetic TestApi am: 493a723df2 -s ours

am skip reason: Merged-In Ic28956ac65f9642b9a78a31fff0111e28c6a69e0 with SHA-1 62fb8f943b is already in history

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

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