Merge "Change ConvertWithBp2build signature" into main am: 0eaa433927

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

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