Merge "Add new aconfig dependencies" into main am: c4aaa296 am: e707fa9c

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



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