Merge "Add screenshot back to power menu for some devices" into rvc-dev am:...

Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e06 am: da8d0957

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

Change-Id: Iafff905c65a0947fa84aa6ae526a0a44f2c3f677