Merge "Allow permission dialog to show more than 2 lines. Test: manually using the permission prompt in StorageTestApp Bug: 174495520 Screenshots: For S (master at HEAD) Before: https://screenshot.googleplex.com/7wDYYtdymm4tB3P After: [1] https://screenshot.googleplex.com/BQwPrqnHodDJaZ2 [2] https://screenshot.googleplex.com/4RiFs2aPdmcQtnE"