Merge "Revert "Update test android manifest to include RESET_HOTWORD_TRAINING_DATA_EGRESS_COUNT."" into main