[automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
am: 05b07f424e
-s ours
am skip reason: Change-Id I63c4e2149b0e9efa16fd9ee402652c67eb9c5a4d with SHA-1 19135546a3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387127
Change-Id: I5bc786d8faf457d85ce90e1226a4c34a2f2752c8
This commit is contained in: