Merge "aconfig: add additional test aconfig to test chaining" into main am:...

Merge "aconfig: add additional test aconfig to test chaining" into main am: bd635ce6 am: 5b619035 am: 1f809d74

Original change: https://android-review.googlesource.com/c/platform/build/+/2885886



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