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 am: 46ca3972" into rvc-qpr-dev-plus-aosp am: 6eae9f6e

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

Change-Id: Ibe6b48097d251c70b3c78879f6e97131ce3fa77a