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

[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 skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 805585ed is already in history

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

Change-Id: I20f8b5e4d3dce7bab786eacd12cf6a4385812280