[automerger skipped] Merge "Add new aconfig dependencies" into main am:...

[automerger skipped] Merge "Add new aconfig dependencies" into main am: ca11748e am: 2725d3bc -s ours

am skip reason: Merged-In I762e1e40592199badebaf6e7156eec2836b195ba with SHA-1 5b19eace is already in history

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



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