Merge "Enable same-file policy for R8 optimizations" am: 8e0ae8e9 am: 07aafdcb

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



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