Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev am: 565fcb4b95
am: b5ee93791a

Change-Id: I151f2ac74a096463932d891c579d648628c98a7e