Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74fbc am: 08aa41473c am: ab5057e8c0 am: 2c3de224a5

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

Change-Id: I620ee0f42b2234802b92cb85506c3fd2e9cc9fbf