[automerger skipped] Merge "[Settings] Data roaming warning only when turn ON" am: 622da45ee6
am: 05b07f424e
-s ours am: 0aa15f333e
-s ours am: 86eb9931e0
-s ours am: 124e5da825
-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: Ia7c60b825b9ce6fb32c62eef9564678d9b2cabb4
This commit is contained in: