Merge "Handle DeadObjectExeption when changing users" into tm-qpr-dev am: ba0a4d16 am: 379feeb4

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



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