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

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

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



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