Merge "Remove unnecessary calling of PayloadGenerator" into main am: 0562b343d1

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

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