Merge "Move the movies metrics constant back into O."

    // OS: O

    FINGERPRINT_REMOVE_SIDECAR = 934;

    // ---- End O Constants, all O constants go above this line ----

    // OPEN: Settings > Storage > Movies & TV

    // CATEGORY: SETTINGS

    // OS: O

    APPLICATIONS_STORAGE_MOVIES = 1000;

    APPLICATIONS_STORAGE_MOVIES = 935;

    // ---- End O Constants, all O constants go above this line ----

    // Add new aosp constants above this line.

    // END OF AOSP CONSTANTS