Merge "UMS use mUsersLock to synchronized" am: 659ccfc928

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccff5479d140d22d91243da91ac0ab0149f10802