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

Change-Id: I646460f9f8c057121f9d2db43ff80a1a3d887d99