Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev
am: 858a27c0b6

Change-Id: Id080a91ff04953a6c878ed18551cf71e20742e32