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

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

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