[automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-qpr-dev am: 20e2f6426e -s ours am: ab2e0e835c -s ours
am skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 805585ed1b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15047818
Change-Id: I4e6464edb9912bcf9f9649fe80f0aa4c9264233e
This commit is contained in: