Merge "Listen to correct intents in UserTracker" into tm-dev am: 87ab8129

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



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