Merge "[Fix settings] Multi user for settings wrapper" into tm-dev am: f2acd204 am: d5d7d582

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



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