Merge changes from topic "codec_availability_hal_api" into main am: 989747ab am: 90d7d571

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3329334



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