Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf959732 am: 6af9bde8 am: 62fc08f6" into oc-dev-plus-aosp