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: ab73ba71 am: 6dc916a4 am: 0366c4a1

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

Change-Id: I2682a3671191c17518fbf7c25a9fe8a287598815