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

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



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