Merge "Fix the Wenum-constexpr-conversion error" into main am: 46a894dc am:...

Merge "Fix the Wenum-constexpr-conversion error" into main am: 46a894dc am: afd9c218 am: a61556a4 am: 63a1aa7a am: b943de5f

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



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