Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca575

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

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