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

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

Change-Id: I6e673aa38e72ea8674f674683abbbc335a5a568d