[automerger skipped] Merge changes from topic "aosp-hal-enum-strings" am:...

[automerger skipped] Merge changes from topic "aosp-hal-enum-strings" am: 691ebfea am: cbf8ba95 am: 6f44f305 -s ours

am skip reason: Change-Id I676bc7222474f2d366bfb4edcd14b83381d68083 with SHA-1 a67ba176 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1515660

Change-Id: I6194aa5f41438b313ba9fb7e09778b16cf727bd4