Merge "[AWARE] Create true translations between legacy and hidl enums" am: 24ff2036ce
am: 945fbf8434

Change-Id: Iedc43ae7d9292131c814752458a2ec6728bb85df