Merge "Fix constant name for KEY_PICTURE_TYPE" am: 3f4c097d55 am: b03e17e4b9

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

Change-Id: I9885535cfa516c737919b30300274f4fa67a6962