Merge "Add feature flag android.hardware.telephony.data"