Ensure device_owners2.xml is always written.

Bug: 335232744
Test: Manual, upgrading from T-QPR3
Change-Id: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35
Merged-In: I7a7dba56f2951e7e3699b19d2517d198dc8f9d35

parent a72e33cc

services/devicepolicy/java/com/android/server/devicepolicy/OwnersData.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -354,8 +354,7 @@ class OwnersData {

		@Override
		boolean shouldWrite() {
		return (mDeviceOwner != null) \|\| (mSystemUpdatePolicy != null)
		\|\| (mSystemUpdateInfo != null);
		return true;
		}

		@Override