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

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

Change-Id: I6f9fd73bf8dc31d5ef3f56aedf8b219c119e4763