[automerger skipped] Merge "Media constans not yet in aosp" am: 14ce184d am:...

[automerger skipped] Merge "Media constans not yet in aosp" am: 14ce184d am: 0d824def am: 855f8ada -s ours am: c783d615 -s ours

am skip reason: skip tag Change-Id Ic3635c425bbd8f47907155be27b0eca76d6fffb0 with SHA-1 19042f13 is already in history

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

Change-Id: I53a04b905c9a8e3d7f3553c6847f9aeb806839bc