Merge "Rename aconfig intermediate file (json -> pb)" am: 8f557323

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



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