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

[automerger skipped] Merge "Fixes update ownership preapproval flow" into udc-qpr-dev am: 112ec2b5 am: 10226944 -s ours

am skip reason: Merged-In I210fe1bb13a2096eb7e087806298ed1d4fa4905d with SHA-1 78c71fae is already in history

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



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