[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-dev am: a40db193 -s ours am: d9ca3e99 -s ours am: c2af7928 -s ours

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

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

Change-Id: I6e7d9dd6331b91b5ebacda3e19242a36c3fb005d