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

Change-Id: I53981066dfc5975aa4bd02b2d5004d286bb7dc63