Merge "Add config_show4GForLte false to US carrier config.xml" into jb-mr2-dev