Merge "Merge "Remove config_tether_apndata for Telstra." into oc-dr1-dev am: e424d123ab am: 4a83143fd3" into oc-mr1-dev-plus-aosp