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

Change-Id: I7b59f38530cebfe33d9baefe636ee7a659a45006