[automerger skipped] Fix enum-compare warning
am: 0c5dfbd743  -s ours

Change-Id: I3cd1f16ffe18b95c20946af1bca461f11b92b70b