Merge "Bluetooth: Enable in-band ringing in vibration mode (3/4)" into pi-dev am: df4f7ec891
am: b08f2bbd51

Change-Id: I31d5c7c90f4098b9b2d8f6915855f470c02d5ba1