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 am: ab5057e8

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

Change-Id: I31b79cd93828a586bbde7421a166545f4422721a