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