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

Change-Id: I7e897d209b648c583d271904cf6fdcf6c3d227c3