Merge "Clear apex.go entries for bluetooth libs" am: 5e8381327b am: f21d38068d

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/2042086

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