[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still...
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c0 am: c034169c -s ours
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a is in history
Change-Id: Id59f155e4e5368d776b5103514bf4e6072438cd9