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