Merge "Use material design for OTAGUI." am: 2793164968 am: d0c2bead51

Original change: https://android-review.googlesource.com/c/platform/development/+/1764186

Change-Id: I269775abb255706a4e9f6e81332295565a6dc0bc