Merge "Replace editable_tether_apn_bool with read_only_apn_types_string_array am: f196b3320b am: 0eac8b5133"