[automerger skipped] Merge "Revert "OMX: Add 64bit consumer usage flag parameter"" into main am: 9176b3d7ee am: 323d3e4d05 -s ours am: 62a951a8dd -s ours am: 82b3766285 -s ours am: 461cd47ce2 -s ours

am skip reason: Merged-In Ie3621e71681d81caa78409487795dec0f3173f0f with SHA-1 89be21b470 is already in history. Merged-In was found from reverted change.

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

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