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

Change-Id: If3c80873ef9da35e57254d1411ad127cac833a04