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

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

Change-Id: Id89eef8efb70c95edfdee5703f0dd3e01b07b47a