Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26': (23 commits)
Enable group mms for Operators
Turn off Instant Lettering for DR carriers
Disable KEY_ADDITIONAL_CALL_SETTING_BOOL for U+
Hide 2G option in Preferred network type for EE
Always show "Turn on Notification" in emergency broadcast settings.
Add carrier config override to escape " and \ for SKT.
Show APN Menu for CDMA phone
Enable KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL for U+
Set carrier-specific invalid characters.
Hide ims apn for some carriers
Set carrier-specific invalid characters.
Rename carrier config constant.
Disable group mms for Korea LGU+
Disallow non-emergency calls while in ECM mode for Sprint.
Uneditable enhanced 4g lte mode
Bug 22748811: Disable MMS for Docomo
Hide merge call button for korean carriers
Add delay of 215ms between DTMF tones for Softbank
Add SBM configuration (44120)
Enable instant lettering for korean carriers.
...
Change-Id: I9a84834b51b71699724317616235173be52d5557