Merge "Move toast line height attribute to default style" into sc-v2-dev am:...

Merge "Move toast line height attribute to default style" into sc-v2-dev am: aaca770c am: ea1414da

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15838088

Change-Id: I71c9f79888f85d17c700896b7f3deeb2e976db02