Merge "Fix for Bluetooth not restarting on User Switch" am: 196b72aae5
am: 543261753a

Change-Id: I008ff84f3d3eb0b7c51993d213a9d3a590cd93a6