Merge "Make it configurable to display the allowed characters in the digit mode" am: c98d4e9461
am: 03f4ee76f4

Change-Id: I22c17f8beed2860e432b4d5453857179d9cd5402