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

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

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