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

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

Change-Id: Ie97434ffcde1ff53d74865d9de0b274e4ede92ed