Merge "Merge "Add PowerOptionsAction to combine Power and Restart when...

Merge "Merge "Add PowerOptionsAction to combine Power and Restart when needed." into rvc-dev am: ae036804 am: a4c26d7c" into rvc-d1-dev-plus-aosp am: dfd7128e

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

Change-Id: I2f98eb268c4fc478162c8826d5a3b2d27098bc77