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

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