Merge \"Preemptively add string for possible toast.\" into nyc-mr1-dev

    <!-- [CHAR LIMIT=200] Body of notification that is shown when performing a system upgrade. -->

    <string name="android_upgrading_notification_body">Some apps may not work properly until the upgrade finishes</string>

    <!-- [CHAR LIMIT=40] Toast that is shown when an app is still upgrading. -->

    <string name="app_upgrading_toast"><xliff:g id="application">%1$s</xliff:g> is upgrading\u2026</string>

    <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->

    <string name="android_upgrading_apk">Optimizing app

        <xliff:g id="number" example="123">%1$d</xliff:g> of