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

Change-Id: Ib10e76a44ee4ea10294b65ba01d2b028df6afe50