[automerger skipped] Clean and reorder operation enums. am: 5d67a0bf05 am: 172f95dda5
am: 86ff94d048 -s ours
am skip reason: change_id Ie5d2bff6fac061bdca0a99e5b8c8ac05733fac4b with SHA1 28a33a9cb1 is in history

Change-Id: I77ad37628b9b973dad3162a47057ed472724ef7d