Merge "[People Service] Prevent system_server crashes due to Content Provider issues in People Service" into main