am e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev

* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
  Removing display number format from SIM UI

diff --cc res/values-af/strings.xml
Simple merge

diff --cc res/values-am/strings.xml
Simple merge

diff --cc res/values-ar/strings.xml
Simple merge

diff --cc res/values-bg/strings.xml
Simple merge

diff --cc res/values-ca/strings.xml
Simple merge

diff --cc res/values-cs/strings.xml
Simple merge

diff --cc res/values-da/strings.xml
Simple merge

diff --cc res/values-de/strings.xml
Simple merge

diff --cc res/values-el/strings.xml
Simple merge

diff --cc res/values-en-rGB/strings.xml
Simple merge

diff --cc res/values-en-rIN/strings.xml
Simple merge

diff --cc res/values-es-rUS/strings.xml
Simple merge

diff --cc res/values-es/strings.xml
Simple merge

diff --cc res/values-et-rEE/strings.xml
Simple merge

diff --cc res/values-fa/strings.xml
Simple merge

diff --cc res/values-fi/strings.xml
Simple merge

diff --cc res/values-fr-rCA/strings.xml
Simple merge

diff --cc res/values-fr/strings.xml
Simple merge

diff --cc res/values-hi/strings.xml
Simple merge

diff --cc res/values-hr/strings.xml
Simple merge

diff --cc res/values-hu/strings.xml
Simple merge

diff --cc res/values-hy-rAM/strings.xml
Simple merge

diff --cc res/values-in/strings.xml
Simple merge

diff --cc res/values-it/strings.xml
Simple merge

diff --cc res/values-iw/strings.xml
Simple merge

diff --cc res/values-ja/strings.xml
Simple merge

diff --cc res/values-ka-rGE/strings.xml
Simple merge

diff --cc res/values-km-rKH/strings.xml
Simple merge

diff --cc res/values-ko/strings.xml
Simple merge

diff --cc res/values-lo-rLA/strings.xml
Simple merge

diff --cc res/values-lt/strings.xml
Simple merge

diff --cc res/values-lv/strings.xml
Simple merge

diff --cc res/values-mn-rMN/strings.xml
Simple merge

diff --cc res/values-ms-rMY/strings.xml
Simple merge

diff --cc res/values-nb/strings.xml
Simple merge

diff --cc res/values-nl/strings.xml
Simple merge

diff --cc res/values-pl/strings.xml
Simple merge

diff --cc res/values-pt-rPT/strings.xml
Simple merge

diff --cc res/values-pt/strings.xml
Simple merge

diff --cc res/values-ro/strings.xml
Simple merge

diff --cc res/values-ru/strings.xml
Simple merge

diff --cc res/values-sk/strings.xml
Simple merge

diff --cc res/values-sl/strings.xml
Simple merge

diff --cc res/values-sr/strings.xml
Simple merge

diff --cc res/values-sv/strings.xml
Simple merge

diff --cc res/values-sw/strings.xml
Simple merge

diff --cc res/values-th/strings.xml
Simple merge

diff --cc res/values-tl/strings.xml
Simple merge

diff --cc res/values-tr/strings.xml
Simple merge

diff --cc res/values-uk/strings.xml
Simple merge

diff --cc res/values-vi/strings.xml
Simple merge

diff --cc res/values-zh-rCN/strings.xml
Simple merge

diff --cc res/values-zh-rHK/strings.xml
Simple merge

diff --cc res/values-zh-rTW/strings.xml
Simple merge

diff --cc res/values-zu/strings.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge