Merge "Migrate and remove account from calling user in headless mode" into udc-dev am: 3d87229f

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



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