Merge "Merge "Show a toast when switching from wifi to Verizon cell data."...
Merge "Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev am: 5d065970 am: a65318a2 am: 64145a51" into nyc-mr1-dev-plus-aosp
am: f0525370
Change-Id: Ie8907f6d58280e3bfdbee1c89f899b8a5c28a4bb