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 am: 815ac4ea am: ed4697d1

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



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