Merge "Listen to correct intents in UserTracker" into tm-dev am: 87ab812996 am: 55b531c74a am: b4bc84f0cf am: 4ad8a03ceb

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

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