Merge "Mark BluetoothClass#getClassOfDevice as TestApi" am: d5eff002eb am: 045247ec3a am: b9edd4fbc4
am: 07fe5664c5

Change-Id: I79e8943ff3ec4791b40eebdf991e71a0935e377b