Merge "Fix enum comparison to reenable -Wenum-compare" am: 8386fad677 am: 0b79314f50

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1774788

Change-Id: I8091fd8f53f22b58c616429f0e95a03fc8351962