Merge "[AWARE] Create true translations between legacy and hidl enums" into oc-dev am: 90b4baef52
am: b8ea23c7a1

Change-Id: Id4ca7e0c72b518f65c5e7a341a78eee5d262b89b