[automerger skipped] Guard mUidBlockedState with a separate lock. am: 6e0d64b9 am: 23aaa83c am: 63966a3d -s ours am: d25d451a -s ours

am skip reason: Merged-In I6a913742647577256c9281dd8ebf4aa5422a49ee with SHA-1 8287585b is already in history

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



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