Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev am: 6a0f27d52f

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

Change-Id: I580cb62d6f806113a16a4913b849d288c64bce0c