Merge changes from topic "bazel_framework_res" into main am: 641b62b2 am:...

Merge changes from topic "bazel_framework_res" into main am: 641b62b2 am: b0e61183 am: f1a3d7a3 am: ae909677

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



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