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 am: 9770d6fe

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



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