Merge "Change AOSP Contacts icon and remove Google logo from launch screen" into oc-mr1-dev am: ef27132abc
am: dd108cb059

Change-Id: I6a164a17f472b270e609a52f330c0aa63410bb88