Merge "Fix com.android.cts.devicepolicy.DeviceOwnerTest#testSetForceEphemeralUsersFailsWithoutSplitSystemUser failure" into pi-dev