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

Change-Id: If0f8f56328866c33128ac4a98c09cd8d20af9b31