Merge "Avoid locking profile task when it is already lock" into sc-dev am:...

Merge "Avoid locking profile task when it is already lock" into sc-dev am: d6be5095 am: 51130212

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

Change-Id: Ib70abb6b5fda7ce7e60e39f08b05cfcf87793377