Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev