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

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



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