Merge "Initialize an uninitialized enum." am: 26537884e4

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

Change-Id: I68a86876061db11b485cf69e0ada5615f57bb40f