Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa am: fa96bb55 am: 33d89a20 am: 7ad2efd6 am: 9f77c3cc

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



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