Merge "Further Clarify Scope of KEY_CARRIER_NAME_OVERRIDE" into pi-dev

    /**

     * Unconditionally override the carrier name string using #KEY_CARRIER_NAME_STRING.

     *

     * If true, then the carrier display name will be #KEY_CARRIER_NAME_STRING, unconditionally.

     * If true, then the carrier name string will be #KEY_CARRIER_NAME_STRING, unconditionally.

     *

     * <p>If false, then the override will be performed conditionally and the

     * #KEY_CARRIER_NAME_STRING will have the lowest-precedence; it will only be used in the event

     * that the name string would otherwise be empty, allowing it to serve as a last-resort.

     * that the name string would otherwise be empty, allowing it to serve as a last-resort. If

     * used, this value functions in place of the SPN on any/all ICC records for the corresponding

     * subscription.

     */

    public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";