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

Merge "Add minimal bp2build converter for combined apis" am: ac03e87f am: b204af45 am: 229983a1 am: 1e79090a am: 20e4fd84

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



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