Merge "Add/remove user state based off user unlocking" am: 85797196b4 am: 6b55ff4456 am: 7fe1787bcf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie89a795b243ae8b09d805274ae8affe8899e6b2b