Merge "Remove unnecessary slice in combined_apis bp2build converter" am: 3cd394fa7d am: fa96bb552c am: 33d89a20f7

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

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