Merge "Always call tieProfileLockIfNecessary() under mSpManager lock" into main am: daa8f946b7

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

Change-Id: I2234bf963e0ede7eeed2b4fc1d077bbe7c880725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>