Merge "Fix gainmap size for recycled inBitmap in BRD" into udc-dev am:...

Merge "Fix gainmap size for recycled inBitmap in BRD" into udc-dev am: fae64dda am: 78c7b01d am: 0c5bedf9 am: 490b5b5d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23750366



Change-Id: I7d645ffdf5b770a03559c1b4cf428d97f0abfe69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>