Merge "Multi-user optimizations." into tm-dev am: 1d23f37e am: 8f6e364e

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



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