Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706
am: c037004fd9

Change-Id: I06831c086920b93f0c1c076e255ce404769b8691