Merge "Add new aconfig dependencies" into main am: c4aaa29619

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3137233

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