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

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



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