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

am skip reason: subject contains skip directive

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

Change-Id: I71fa5cdda504fbb0ff013f17cf9d987349f17687