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

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

Change-Id: I10fd6d184a2bee9fa921b0d308a97ae749d8f101