[automerger skipped] Merge changes from topic "64bit-usage" into main am:...

[automerger skipped] Merge changes from topic "64bit-usage" into main am: 4cf9ab59 am: fb2d4066 -s ours am: 13c4859b -s ours am: bacadba0 -s ours

am skip reason: Merged-In I9176954db677fed5dcf762380cfcc77f888a48de with SHA-1 380046d2 is already in history

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



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