Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: 5cb5825c09 am: 2b80409306" into rvc-qpr-dev-plus-aosp am: 321525ac8c

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

Change-Id: I7f161bbbf7a76002c40b3ce7ad0849e83d683a10