Merge "Fix enum comparison to reenable -Wenum-compare" am: 04d22dd656

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

Change-Id: I1fa3f15e30051bc238e93bad0549b8f32a010767