Merge "Add new members to mutiuser owners" am: c2ed96db am: d9ad67d9 am: 348755d4

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



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