Merge "Add/remove user state based off user unlocking" am: 85797196b4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief182a280a252187abd50fc68ff11f3bdcc978e2