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

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



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