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

Merge changes from topic "am-d546ff9a8dfd404c9a30b39719d06caf" into tm-qpr-dev-plus-aosp am: 127e8474 -s ours

am skip reason: Merged-In Ie28c4e1e82d35ae5b8f20cb775d55fad6ff59b54 with SHA-1 8e861b60 is already in history

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



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