Merge "Replace user switching events with UserTracker" into tm-qpr-dev am: c0b37557bc am: ad2ee4833d

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

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