Merge "Keeps power key intercepted during a panic gesture" into sc-dev am:...

Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf1 am: 8c27ef7c am: bb04a0bf

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

Change-Id: Ie29a0edf68d1667f55e1009dce2f6ecc5251e322