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: 3719b3b0

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



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