[automerger skipped] Merge "Ensure device_owners2.xml is always written." into...

[automerger skipped] Merge "Ensure device_owners2.xml is always written." into udc-dev am: f3d825f0 am: f0390826 -s ours

am skip reason: Merged-In I7a7dba56f2951e7e3699b19d2517d198dc8f9d35 with SHA-1 aaa86cdf is already in history

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



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