[automerger skipped] DO NOT MERGE: Carve out EVS Enumerator on automotive device am: 13a1c1531e -s ours am: 1d5d877b1e -s ours
am skip reason: subject contains skip directive

Change-Id: Ib86f8cc5b4b132ab7b37e76ebfd9640678d8e925