Merge "Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: d7808d3dd9" into rvc-d1-dev-plus-aosp am: 0441a937ac" into rvc-qpr-dev-plus-aosp