[automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 -s ours

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

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

Change-Id: I55441d4f3f6b31d7ae20d91a60b2a4da0de4ed77