Merge "aconfig: update cache arg to support multiple cache files" into main...

Merge "aconfig: update cache arg to support multiple cache files" into main am: 45db966e am: c92f754b am: a8864899

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



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