Merge "Bluetooth 5 Enable->Enabled (1/2)" am: fa69eeac5c
am: cde107da6c

Change-Id: Id8151bf6c58a384b5ca264faae71b601a9dcfc63