Merge "Adding bluetooth apex" am: 873879d5f3 am: 2e65481365

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

Change-Id: Ie2128ca9add6201218bd40e8871ba3a1ac19c6c4