[automerger skipped] Revert "DO NOT MERGE Use original country locale to parse phone number without country code."
am: ef041cba70 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia2aa3528b8a7e2b1aa998dbfc75e34949c955c74
tree: 772ad4d717fc8033d22731eedea7b91b58719128
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags