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

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

Change-Id: Ic8d98cad7f9c8aed2d967b0959fa0e989a763abb