Cherry-pick: Iae1d8e9752c355d08d7f3d0fe7057fce61ea702f Bug: 4406840 Change-Id: I5e0109b427093a459d2937809498985dc8409f97
This change also re-orders the laternate characters on mini keyboard. Bug: 2214959 Change-Id: Id44c5b0c05f9f32ff939ad91d229d83731f2a135