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 am: f770760a -s ours

am skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 499234d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15047818

Change-Id: I7a6e48178da2978dc51a472f263a6c9293efbb6a