[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: c998a5d6 am: 5e1e9aa9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f9b53516ce49d6980f39e0dac9d3b18bdfdbd59