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

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

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