Merge "Power button press behavior should account for default display state" into sc-dev am: d914330cfc

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

Change-Id: I5b82d0cafc58b75ff0f8d76e0460acce1ce9b873