[automerger skipped] Merge redfin/bramble support. am: a1a1d948a1 -s ours

am skip reason: Change-Id Ib1f492fa3bca03fdc718a62372cf43da92647b7f with SHA-1 bb0ef13c26 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/1466025

Change-Id: I9d01a9828bc31c984d21685291f5003719b960ae