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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I962b632c5ca389109cb8381af4812529bc24797a