Merge "Add logic to persiste BMM events to a text file and print them in the dumpsys function" into main