Merge "Fixes update ownership preapproval flow" into udc-dev am: af6fae7f am: ec703631

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



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