Merge "Report AC-4 decoder profile and level" am: e091cebf am: 452cd4a7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389989



Change-Id: I5cf91993894e4a46aabce1c13bb13c50a3413cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>