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