[automerger skipped] Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev am: 8a7d8bce am: f5a4bfea -s ours Change-Id: I7ae0a9adea215bfad26715be4bb6d85536e91ef6