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

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

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



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