Merge "Revert "Revert "Revert "Revert "Add integration test for testing...

Merge "Revert "Revert "Revert "Revert "Add integration test for testing generat...""" am: 44ac6dad

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



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