am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev

* commit '3ad41537100e54d35d48f677eaae7f10934f3a15':
  Adjust edit text layout, ripple alphas to be closer to Material spec