Merge "[automerger skipped] Merge "Avoid locking profile task when it is...

Merge "[automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-qpr-dev am: 20e2f642 -s ours am: ab2e0e83 -s ours am: 92d8c8a9 -s ours" into sc-v2-dev-plus-aosp