Merge "Add persistent logging for BT events" am: 067d5ac2fe am: 47c68f78b6
am: 03045e6519

Change-Id: I51ad77208296ead5fb78b45d09ca13133b148ba6