Merge "Unwrap our DrawableWrapper impls in canSafelyMutateDrawable()" into mnc-ub-dev
am: 744a28f8d7

* commit '744a28f8d7b3b87189ea350d0067327130e5f112':
  Unwrap our DrawableWrapper impls in canSafelyMutateDrawable()