Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev am: bf66bf30b1
am: 4dddaf18e1

Change-Id: I249a0a3fc1a8c030041cfca8b3dbd49bc2badf07