Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"