Merge "Adds a default for the badging curve thresholds to Settings app resources; this will be the fall-back default used by the WifiSettings in follow-on work."