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

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

Change-Id: I829c3d459cecc39a88e6b0c82d5aae15b64eb20e