[automerger skipped] Merge "[DO NOT MERGE] Add placeholder for info panel in...

[automerger skipped] Merge "[DO NOT MERGE] Add placeholder for info panel in new power menu" into sc-dev am: 6725b633 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iec82119b01dcd93d6f4a581e2f4a1d6826db98a3