[automerger skipped] Merge "Move Bluetooth specfic APIs called in Settings to...
[automerger skipped] Merge "Move Bluetooth specfic APIs called in Settings to BT DatabaseManager" am: 43521177 am: fbc7d10e
am: a7fa1e92 -s ours
am skip reason: change_id I6b5a35a36a27f6cadfae50b2bf9fe87a3f0985f4 with SHA1 f57565ed is in history
Change-Id: Ic87ed244c8365f0b69a8e754f56616d0659a6b33