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

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

Change-Id: I7219e51a397b447929bd3d6d3de49244f1333616