Merge "gralloc4: fix PlaneLayout encode typecasting" am: 05288dde01 am: ed13f4b291

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1426629

Change-Id: I576352b8b00fa5aed77ceaea48c44882f6119e4d