Merge "Fix NPE in requestPowerState when displayPowerController is null" into main am: daf616ad5a am: 47474439c9

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

Change-Id: I0f6af27ff5f33e9fe83e946f910d672cec5b7cfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>