Merge "Revert "Create a system API to allow preinstalled assistants to receive training data events."" into main