Remove redundant Bluetooth from internal class names
am: b45ecd2fd7

Change-Id: Id7b7adfe228e2729eaf542aba0ce0bcbf005e527