bluetooth: hammerhead: attempt to fix bt disconnect issue

* use changes from g2

Change-Id: I2b962629ab30154d76f41ac941e8db811a53106e