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

Change-Id: I3bfb9095920762253f6aa16a7b27072a480a5279