Merge "[People Service] Fix issue in AOSP people service where `setupUser` in...

Merge "[People Service] Fix issue in AOSP people service where `setupUser` in the People DataManager is stuck" into tm-qpr-dev am: 971c4790 am: 83c36900

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



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