Merge "Change ConvertWithBp2build signature" into main am: 0eaa433927 am: 5b97b21847 am: 5f857bb648 am: f4b2b2a671 am: bc57643eec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2751686

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