Merge "Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee am: 02712488" into rvc-d1-dev-plus-aosp