Merge "Returning camcoder profiles for advanced codecs" into tm-qpr-dev am:...

Merge "Returning camcoder profiles for advanced codecs" into tm-qpr-dev am: 84422bf1 am: 1d74fbdd

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



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