Merge "Add minimal bp2build converter for combined apis" am: ac03e87f1b am: b204af45dd

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

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