Merge "Add new aconfig dependencies" into main am: 01ed6b75 am: 20199948

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



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