[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: badced77b8 -s ours am: 2fec26a361 -s ours am: 3172d841d9 -s ours am: afd542dfd9 -s ours

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

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

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