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

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

Change-Id: I2eacbb473247e7bc51aa280d70594ad3f40d114b