[automerger skipped] Merge "Fixes update ownership preapproval flow" into udc-dev am: af6fae7f4d am: 8916997b90 -s ours am: 6d0fcd34a6 -s ours am: 557dedbbe9 -s ours

am skip reason: Merged-In I210fe1bb13a2096eb7e087806298ed1d4fa4905d with SHA-1 917f022216 is already in history

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

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