[automerger skipped] Merge "[Settings] Expose @hide #setDataAllowedDuringVoiceCall and #isDataAllowedInVoiceCall as @SystemApi" am: 3ba74ca897 am: d1c0f8faac am: ad0dc8e479 -s ours
am skip reason: Change-Id Ib0e6bfa01db9cfabae7ebcce4548dc885e589144 with SHA-1 66f08c4947 is in history

Change-Id: I2ebc8632a9365e0a4fbed4fbb2bc7b26e14f63b5