Merge "When user presses the power key while playing a local video, the...

Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74f am: 08aa4147

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1920360

Change-Id: I27b3c33dbbbc5d65c7aedd4bd9f5dee4e123828d