[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: badced77 -s ours am: 2fec26a3 -s ours

am skip reason: Merged-In I85012b8b87e4c4ff98150f091a92721a3c7242b9 with SHA-1 210d52ea is already in history

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



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