Merge "Modify Bluetooth Class of Device from Android stack" am: f4ec2ab706 am: c037004fd9 am: 69da7a1766
am: 252eebec97

Change-Id: I24594136dcf5e813f0e29de896fbb5d3abd7b777