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

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

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