Merge "Fixed language screen so that locale preferences that do not go to sublocale preference screens do not show carets." into pi-car-dev am: 6dec688ca7 am: 2c88819a94

Change-Id: I0573e44caebb3a48e2926b899b8070725242b5e7
tree: 5efb1b0c121b3d7012fc89f32e9a9248946d6880
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg