Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa am: fa96bb55

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



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