tree 9c4a43c242bf92beb925b218c7cdad5894a33e18
parent 7e64c1c89ae04f053814ea2e26fd33166d3d47df
parent d431a648574f36fe219cade08111c4db961223ee
author Bill Yi <byi@google.com> 1600498862 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600498862 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b01d5c4516 am: 5949990e0a -s ours am: d431a64857 -s ours

am skip reason: Change-Id Ie54e5d06722d866888bf58ae3202a5f4030d4897 with SHA-1 519dcb07b2 is in history

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

Change-Id: I993b0d06ff9266a8eed28f58163daaa42794c7de