am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev

* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
  Update locally cached drawables when constant state changes