tree 428274bb85930c6b9459f8cf38d1f4912b339952
parent ad730d757343341f80a567350556d49e1528fcc9
parent d1c0f8faacf4a23aa2dc2ea4260a03c07ef06035
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581138402 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581138402 +0000

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

Change-Id: Ieebfcebc518768df31d3f5e23840b2279aa007d8