Merge "Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2 am: 5cb5825c am: 2b804093" into rvc-qpr-dev-plus-aosp