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: e3b71350

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



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