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

Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2 am: d7808d3d" into rvc-d1-dev-plus-aosp am: 0441a937

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

Change-Id: Ib39f46e4ac626331146d612361c871c73e925d45