Merge "Add carrier config for data roaming notification" into qt-r1-dev
am: 1482be4c67

Change-Id: Ieb1a10fa4620d003b51e63561d6429bcb7348e61