Merge "Delete aapt2 generated java files after creating srcjars" into main am:...

Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab am: b5c37f9b am: 10ecc7ed

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



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