Merge "Merge "Updates internal lock task mode state early" into rvc-dev am: 836d2b0f am: 433364c4 am: bdeb63f8" into rvc-qpr-dev-plus-aosp