am 8a0c8e78: am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"

* commit '8a0c8e78a7d938288e065b21e78b2de6097b1599':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams