[automerger skipped] Merge "Convert apct/managed_provisioning/presubmit_test to Test Mapping Suite." am: 6e5f312d am: a074c289 am: 3f030742 -s ours am: 0a355570 -s ours am: fad432a5 -s ours

am skip reason: Merged-In I8234cc5cadae2ed2162cb09ec8695c7262fcdb2e with SHA-1 6d9b0f71 is already in history

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



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