am ba6f0890: Merge "Add missing Material EditText style redirect" into lmp-mr1-ub-dev

* commit 'ba6f08903c8485fc02864afb4f85469fd42ae115':
  Add missing Material EditText style redirect