Merge changes from topic "am-a58a035d5adf44e6a3ba63ca7ff9a060" into...

Merge changes from topic "am-a58a035d5adf44e6a3ba63ca7ff9a060" into tm-qpr-dev-plus-aosp am: d2d05f8d -s ours

am skip reason: Merged-In I40a3b1acac44ed8a474aad94b77aee8f7399eb31 with SHA-1 05ce6b52 is already in history

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



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