[automerger skipped] Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e am: 1a6fa2ea72 -s ours

am skip reason: Change-Id I257636ae2a6ed74044e71e49a99024682c3a92c5 with SHA-1 97ba024fb0 is in history

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

Change-Id: Ica809882180c5aebb739390ab2b4708bb36063b5