Merge changes from topic "cherrypick-revert_allowUpdateOwnership" into udc-dev am: d83a9ca3

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



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