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

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

Change-Id: Ie4834542c78423d8b4e2911a39cf26a1ad686deb