Merge QP1A.190122.001
Conflicts:
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-az/strings.xml
res/values-bn/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es-rUS/strings.xml
res/values-et/strings.xml
res/values-eu/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr-rCA/strings.xml
res/values-fr/strings.xml
res/values-gl/strings.xml
res/values-hi/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-hy/strings.xml
res/values-in/strings.xml
res/values-is/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ka/strings.xml
res/values-kk/strings.xml
res/values-km/strings.xml
res/values-kn/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-mk/strings.xml
res/values-ms/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-si/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-uz/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rHK/strings.xml
res/values-zh-rTW/strings.xml
src/com/android/settings/ResetNetworkConfirm.java
src/com/android/settings/datausage/CellDataPreference.java
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
Bug: 123905421
Change-Id: I246e6b12388f8d4aa5dfee5539759238a9a0bf43