Merge "Initialize an uninitialized enum." am: 26537884e4 am: ddca6226f9 am: ddc5686e68 am: ed883a6cb6

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

Change-Id: Ifecaaf97505c894e6bcbb43e46cf81db2c893965