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

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

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



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