Merge "Use same formula to check height and input text size" into rvc-dev am:...
Merge "Use same formula to check height and input text size" into rvc-dev am: 17dea302 am: 8da2dd03 am: 3723ad2d am: 6e0718e5
Change-Id: Ib768c73022ec43500e916c6ab2b36260ffa6763f