Merge "Add minimal bp2build converter for combined apis" am: ac03e87f

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



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