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

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



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