[automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 am: 7e8c8d25f6 -s ours am: c62d247cd5 -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: I725f4ad68018b59f267376a28c8ff2729b8b6277
This commit is contained in: