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

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

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