Bug: 325181889 Bug: 315241296 Test: mmm packages/modules/Bluetooth Change-Id: I7b05aa7f4e2645ee01795c78f663dddb989487be