[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
am: c034169ccd
-s ours am: 8ab7db3359
-s ours am: 7322f57974
-s ours am: 2fb82ffac9
-s ours
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
is in history
Change-Id: I97e493efeee62bec7e12b3d01849305917972bcd
This commit is contained in: