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

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



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