Bug: 325929235 Bug: 315241296 Test: mmm packages/modules/Bluetooth Change-Id: Id3b09125ddcb4dc0618a7fa3cc3891fd4f9cfc80