am a406b5fc: Cherry pick relavant changes to mr0 to fix bug of losing national prefix in formatInOriginalFormat.

* commit 'a406b5fc8c99b50812e9e1a97cdaa4cb1be505ee':
  Cherry pick relavant changes to mr0 to fix bug of losing national prefix in formatInOriginalFormat.
tree: 11d8eb4bcea4c8059ee0ac716d321f1d1227411b
  1. java/
  2. MODULE_LICENSE_APACHE2
  3. NOTICE
  4. README.android