Merge "Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am:...

Merge "Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2 am: d7808d3d" into rvc-d1-dev-plus-aosp am: 0441a937" into rvc-qpr-dev-plus-aosp am: a51dbd6e

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

Change-Id: I103ceb8eb3f9fbd2e4359329f5a4fe39809caf08