Merge "Data Usage, materialized!" into lmp-dev

        </activity>

        <activity android:name="Settings$NotificationAccessSettingsActivity"

                  android:label="@string/manage_notification_access"

                  android:label="@string/manage_notification_access_title"

                  android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />