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

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



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