Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06
am: 6e154cfb98

Change-Id: I985957eb0322dc13571705f9cc8d5abe65a931bb