Merge "Bluetooth: Remove use of deprecated API(s)."
am: 2a5dee9464

Change-Id: I5ec44d774e3518fc6e85eb1535a6a932e1e7ac47