Merge "Migrate and remove account from calling user in headless mode" into...

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

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



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