[automerger skipped] Merge "[DO NOT MERGE] Update power menu info messsage"...

[automerger skipped] Merge "[DO NOT MERGE] Update power menu info messsage" into sc-dev am: 100b0929 am: d22103d9 -s ours am: 65df52b1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I245d544a03675915dfccadcf3c2b6bf3d709f115