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

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

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