[automerger skipped] omx: check HDR10+ info param size am: f816148a71 am: cc57ee47c6 am: 4b693c0a2c am: dd41492a2b am: df79827208 am: 36da4d4098 -s ours am: 02171c0fdc -s ours

am skip reason: Merged-In I72523e1de61e5f947174272b732e170e1c2964df with SHA-1 f816148a71 is already in history

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

Change-Id: I2e5e1e85a63e7e84317c236cb7862d0af022b790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>