Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77f am:...

Merge "Remove special handling of prebuilt_framework-res" am: 35dcf77f am: 76093aad am: 4d764857

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



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