Merge "Merge "Ensure staged rollback status is logged on boot" into rvc-dev...

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

Change-Id: I7c132a51f2fbedb99afd32df7e3e5fb1b6a6309e