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