Merge "Invalidate the people cache on Contacts provider changes." into lmp-dev