[automerger skipped] Merge "OMX: Add 64bit consumer usage flag parameter" into...

[automerger skipped] Merge "OMX: Add 64bit consumer usage flag parameter" into main am: d56c5ca6 am: 86083765 -s ours am: 04b92373 -s ours am: 5f329cdc -s ours

am skip reason: Merged-In Ie3621e71681d81caa78409487795dec0f3173f0f with SHA-1 89be21b4 is already in history

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



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