Merge "Fix GetCareMap for small images" am: 8ef44309b2

Original change: https://android-review.googlesource.com/c/platform/build/+/1940646

Change-Id: I2232100525f8ae17ea886f3923557244568f5dd9