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: 9efbca2b

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

Change-Id: I3b82cc838f047265ae783f0aec20d2e74ca705df