Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
am: 86fd147ac6

Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb