Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
am: cbb8cd77d5

Change-Id: I6bde37abe9c41ef3b2bf0ee0829eed340eb0842a