Merge "Stops updating A11yUserState on ACTION_USER_PRESENT." am: f38f9ca575 am: 7ba78da385 am: 10e870c773

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

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