Merge "Merge "Mark libbluetooth-types as vendor_available" am: 29f35918 am: 9ae297d0" into oc-dev-plus-aosp