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: If297f4d26596b5ab39de94e4c0e76176a3799681