Merge "Add AID_EVS for use by the Automotive EVS system"
am: 58620a8d4a

Change-Id: Ie15b1c633e889791c91a8836a28ead426a8cec58