[automerger skipped] Merge "Update Bluetooth api" am: ff44a781 am:...
[automerger skipped] Merge "Update Bluetooth api" am: ff44a781 am: 027a9244 am: f0bcac52 -s ours
am skip reason: Change-Id I527813e38583a4e4a1489090e8a17c6bd50c3e81 with SHA-1 cfca56fe is in history
Change-Id: I868e077713c4e4a86e69971edfa5fca90e8a239b