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

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



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