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

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

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