Merge "Add screenshot back to power menu for some devices" into rvc-dev am: 30233e0682 am: ab73ba71fb am: 6dc916a49d

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

Change-Id: I8cf6c0ac4a1d2862cfd96a66af25a2ce21ce0090