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

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

Change-Id: I002f203576f3a7e2aea3991d00b6309627ee4568