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: ab64b323 am: 0d7d9744

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

Change-Id: I3428d39cfc4e3932f7c4b8b92a4aa845826f44d7