resolve merge conflicts of c640e2c4 to ub-deskclock-huddle

<manifest

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

    package="com.android.deskclock"

    android:versionCode="500"

    android:versionName="5.0.0">

    package="com.android.deskclock">

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

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