Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: 5cb5825c09 am: 2c4a768577

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

Change-Id: I918a357d8d7460abd9ae0070afd1cc4793296511