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

Change-Id: Ida3fdf8d6a90a3ed3f24a0a8bb1552e10b1c747f