am 8040e47d: am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev

* commit '8040e47d83e3fe2c1d28c2dcbfbd80fd5cc0b26f':
  Add colorEdgeEffect to themes, default it to colorPrimary