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

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

Change-Id: I59da44847b84fc262248409dbe8e49c608743886