Merge "Fix the problem of resource integration confusion caused by not adding...

Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main am: 30f6e282

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



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