Sync tieProfileLockIfNecessary() with internal main am: ada6ce9436 am: 4785bcc02e

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

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