Merge "Revert "Align boot jar exclusion with apex_contributions"" into main...

Merge "Revert "Align boot jar exclusion with apex_contributions"" into main am: 7d5b29ef am: 5501c820

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



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