resolve merge conflicts of 82f4b931 to master

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.contacts"

    android:versionCode="10407"

    android:versionName="1.4.7">

    android:versionCode="10408"

    android:versionName="1.4.8">

    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />

    <original-package android:name="com.android.contacts" />