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

Change-Id: I0da9a9c515e6ae23b5449d4b53b6268ce5beaece