Merge "Add new aconfig dependencies" into main am: 01ed6b75ec

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

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