Merge "Reduce number of saveLayer calls in RippleDrawable" into lmp-mr1-dev automerge: b724314
automerge: 0bc1eee

* commit '0bc1eee096e04d9d0a405961b56569446c0e79ab':
  Reduce number of saveLayer calls in RippleDrawable