Merge changes from topic "am-2fe6adedd1b5449699c67439706b0ad8" into...

Merge changes from topic "am-2fe6adedd1b5449699c67439706b0ad8" into tm-d1-dev-plus-aosp am: ccae95b7 -s ours

am skip reason: Merged-In I46cf14e7e71e35a5982d8073707bbbf558be9be6 with SHA-1 e467567f is already in history

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



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