Merge changes from topic "presubmit-am-ddc8d2251f8e4bb68f5e3cf811f638f9"

* changes:
  [automerge] 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 2p: 671140a0da
  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