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

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

Change-Id: I96535d18635acd03d016d55a6ffdec7fd8565926
Signed-off-by: Automerger Merge Worker <[email protected]>