Merge "Provisioning team setup" am: 123221ff83

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

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