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

Change-Id: I17e82ff6f2951a2709a63cdfd3f62d23b9f24d13