Update bluetooth configuration

Change-Id: I5e14c11874bc3768ba696fd80112a4359c9f9bb7
Recover wifi-ap config

Change-Id: I4db6f60850c79c59c9d93b52e83888b2005928d8