Merge "[Bluetooth apex] Use new apex name" am: 3d3e4d5a4a am: 8e01fefb0f am: 0555e52fe3 am: 2d8600ffc5 am: bd07021caa

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

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