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