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

Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2 am: 5cb5825c am: 2b804093" into rvc-qpr-dev-plus-aosp am: 321525ac

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

Change-Id: I7f161bbbf7a76002c40b3ce7ad0849e83d683a10