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

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



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