[automerger skipped] Merge "Fixes update ownership preapproval flow" into...

[automerger skipped] Merge "Fixes update ownership preapproval flow" into udc-dev am: af6fae7f am: ec703631 -s ours am: 35e2c094 -s ours

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

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



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