[automerger skipped] Merge "Reapply "Use R8 for resource shrinking"" into main...

[automerger skipped] Merge "Reapply "Use R8 for resource shrinking"" into main am: 2f6b403c am: 77379a47 am: 629d8aee -s ours

am skip reason: Merged-In Ib8a6fb128084e994325b975c46a036cb41494654 with SHA-1 20c20100 is already in history

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



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