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: Icf0109d2d5a4e3167221927a3afc1e8ade0af0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>