Merge "Bluetooth: fix enable log: display 24h time" am: 17cb857301 am: add7c533c6
am: 5c44929f79

Change-Id: If69f2d82f61784b79e6f64d335c70c98b89f6542