Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac

Change-Id: Ieebfcebc518768df31d3f5e23840b2279aa007d8