Merge "Provisioning team setup" am: 123221ff83 am: d281947294 am: ff49f87525

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

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