Merge "Merge "Fix a mismatch in Bitmap_createFromParcel" into sc-dev am: 6a0f27d52f am: d797c5a620 am: 8b65a252d4" into sc-v2-dev-plus-aosp am: efd8edb37a

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

Change-Id: Ib0599173bddb149c1cddb0be6630f1ad358af139