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

Change-Id: Ib12f75ca258d9f0f5ac35acfe0bd4e7f992728d1