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 am: bb53a4fc

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



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