Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e06 am: da8d0957 am: 4250e772 am: 27bdd459

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

Change-Id: I25e54f6591f8d179cdc01ccc9df07e32d0ae12a7