Merge "[base] Fix logic around overriding DO when there are accounts on...

Merge "[base] Fix logic around overriding DO when there are accounts on device." into udc-dev am: e144f35e

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



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