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

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

Change-Id: Ib8876c5ef57d97b26ae329b138fcd62eca9278d7