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

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

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