Merge "Ensure device_owners2.xml is always written." into udc-dev am: f3d825f0

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



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