am 7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev

* commit '7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
  Propagate DrawableContainer state on mutate, fix ColorDrawable theming