[automerger skipped] Shorten NNAPI enum range names am: 2739b2ef57 am: d290c8d226
am: 3266cdf3bd -s ours
am skip reason: change_id I5138589acc127336e8c0e72ca7d6b49532a4eeb9 with SHA1 794703db84 is in history

Change-Id: I1226dd6e3978a0f1dc96b23af7c5b4613a0cdeb6