Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]

This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev

* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
  Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Merge commit '3d924f1e' into manualmerge
telephony: Add same named operator configuration for some operators

Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
am ea56c795: am bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."

* commit 'ea56c795b0b4997f5835ec42a18eccdb173bc468':
  Telephony: Handle DATA_CALL_LIST in DCC.
am 01de2432: am 24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"

* commit '01de243263d347f2ac13a239d67d41817e34df33':
  frameworks/base: move idmap from frameworks/native
am 3bec0fbb: am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"

* commit '3bec0fbb349a969934828ee726956877a3a21dee':
  AArch64: Use long for pointers in SurfaceSession class
am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."

* commit 'b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
  Add hidden minor version ID for support lib workarounds.
am da379447: am 509a243c: Merge "Check the return value of listFiles on the ifw directory"

* commit 'da37944785c47b2b92c1a0f79c5d602256859fe6':
  Check the return value of listFiles on the ifw directory
am 4870c813: am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."

* commit '4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
  Fix destruction issues relating to AllocationAdapter.
am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."

* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.
am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."

* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6':
  Extended locales in AAPT / AssetManager.
am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."

* commit '92a09fbdebae5362633db281bc155ed1f1145588':
  Move Json{Reader,Writer} test to cts.
am e6d256c5: am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"

* commit 'e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
  Fix, MountService now only sends one onShutDownComplete
am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"

* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT
am 660a514e: am 60097a9c: Merge "Structure device not freed in error case"

* commit '660a514e80e0019d8c6632e84bd03491722fc2ab':
  Structure device not freed in error case
am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"

* commit '7a4172d190871c6b17124bf86374304cef727984':
  Fixed a possible infinite loop in JsonReader#skipValue()
am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."

* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."

* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.