[automerger skipped] Merge "Revert "OMX: Add high bit of usage flag during...

[automerger skipped] Merge "Revert "OMX: Add high bit of usage flag during conversion"" into main am: 8a3d9248 am: e153d969 -s ours am: 5e64b099 -s ours

am skip reason: Merged-In I9176954db677fed5dcf762380cfcc77f888a48de with SHA-1 380046d2 is already in history. Merged-In was found from reverted change.

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



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