Merge "platform/msm_shared, app/aboot: Use locked/unlocked state instead of boot state for ROT"