[conflict] Merge changes from topic "reland-64bit-omx" into main am:...

[conflict] Merge changes from topic "reland-64bit-omx" into main am: f67a94c5 am: df50b6d3 am: bd6c62b7 am: c468e5ad

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



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