[automerger skipped] Merge "Fixes update ownership preapproval flow" into udc-dev am: af6fae7f4d am: ec703631f5 -s ours

am skip reason: Merged-In I210fe1bb13a2096eb7e087806298ed1d4fa4905d with SHA-1 8ac8df1938 is already in history

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

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