[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 -s ours am: 52db881d am: a8dd4f8b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iabefaf725ae13c2a6680017cbd470e005ca2361d