Merge "Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276 am: 6af9bde898 am: 62fc08f684" into oc-dev-plus-aosp
am: d965b300ab

Change-Id: I184e2ab1a9692e04ffcef9601d7bab5856611bba