Merge "Add permission to override display mode requests" am: 7fb5deb779 am: 83a8725d55 am: 794938dfa7 am: 544040036e

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

Change-Id: I51b0cd00440ee14c6ec07cb5ab209cf5728ae441