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: Ib9fbc19f373f3b4cfac11994e21b3c2fc0a1f284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>