[automerger skipped] Make Display.Mode.isSynthetic TestApi am: 3079ba953c -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: Ia06bd9fc51a247d907f3acea8b50c28d4932619a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>