Merge "More eagerly collect isSimpleUserSwitcher." into tm-qpr-dev am: fc2e8ed238

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

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