Merge "Send disable messages when Bluetooth is disallowed am: 6291fae585 am: 70fe2c994b" into oc-dr1-dev-plus-aosp
am: b1be27c763

Change-Id: Id441d6dbe9d3d3edc7bd5b782f02b3fb24ec6cd5