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

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

Change-Id: Ie59f64cf62dd2d02b14c8619ea5732988e8096b6