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

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



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