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

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



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